From 1f7cb1c86f90d616394529e618c5fa4a9ae9f226 Mon Sep 17 00:00:00 2001
From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Wed, 22 Jun 2005 17:52:29 +0000
Subject: [PATCH] Misc minor style cleanups and warning fixes.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@1211 f51c46e8-681c-474f-0cfe-069cfd0219fb
---
 gpsbabel/csv_util.c        | 1 -
 gpsbabel/filter_vecs.c     | 2 +-
 gpsbabel/jeeps/garminusb.h | 1 +
 gpsbabel/jeeps/gpslibusb.c | 1 +
 gpsbabel/maggeo.c          | 1 +
 gpsbabel/mkshort.c         | 3 +++
 gpsbabel/vecs.c            | 2 +-
 7 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gpsbabel/csv_util.c b/gpsbabel/csv_util.c
index e2423a5b1..efa433f03 100644
--- a/gpsbabel/csv_util.c
+++ b/gpsbabel/csv_util.c
@@ -43,7 +43,6 @@ extern char *prefer_shortnames;
 extern const char *gs_get_container(geocache_container t);
 extern geocache_container gs_mktype(const char *t);
 extern geocache_container gs_mkcont(const char *t);
-extern const char *gs_get_cachetype(geocache_type t);
 
 static double pathdist = 0;
 static double oldlon = 999;
diff --git a/gpsbabel/filter_vecs.c b/gpsbabel/filter_vecs.c
index 238d93e10..08b832f83 100644
--- a/gpsbabel/filter_vecs.c
+++ b/gpsbabel/filter_vecs.c
@@ -204,7 +204,7 @@ alpha (const void *a, const void *b)
         const fl_vecs_t *const ap = a;
         const fl_vecs_t *const bp = b;
 
-        return strcasecmp(ap->desc , bp->desc);
+        return case_ignore_strcmp(ap->desc , bp->desc);
 }
 
 /*
diff --git a/gpsbabel/jeeps/garminusb.h b/gpsbabel/jeeps/garminusb.h
index edc7b800d..96acc9232 100644
--- a/gpsbabel/jeeps/garminusb.h
+++ b/gpsbabel/jeeps/garminusb.h
@@ -56,3 +56,4 @@ int gusb_cmd_send(const garmin_usb_packet *obuf, size_t sz);
 int gusb_cmd_get(garmin_usb_packet *ibuf, size_t sz);
 int gusb_open(const char *portname);
 int gusb_close(const char *portname);
+int gusb_init(void);
diff --git a/gpsbabel/jeeps/gpslibusb.c b/gpsbabel/jeeps/gpslibusb.c
index d62dd9565..5128ad809 100644
--- a/gpsbabel/jeeps/gpslibusb.c
+++ b/gpsbabel/jeeps/gpslibusb.c
@@ -52,6 +52,7 @@ static	usb_dev_handle *udev;
 static void garmin_usb_scan(void);
 static void garmin_usb_syncup(void);
 
+int
 gusb_init(void)
 {
 // usb_set_debug(99);
diff --git a/gpsbabel/maggeo.c b/gpsbabel/maggeo.c
index 94cddd34f..f94960107 100644
--- a/gpsbabel/maggeo.c
+++ b/gpsbabel/maggeo.c
@@ -100,6 +100,7 @@ maggeo_fmtdate(time_t t)
  * cleansing it of NMEA-isms and decomposing to ASCII as we go.
  */
 static
+void
 append(char *buf, const char *str)
 {
 	char *cleansed1, *cleansed2;
diff --git a/gpsbabel/mkshort.c b/gpsbabel/mkshort.c
index ce45907b8..b670d31d9 100644
--- a/gpsbabel/mkshort.c
+++ b/gpsbabel/mkshort.c
@@ -425,6 +425,9 @@ mkshort_from_wpt(void *h, const waypoint *wpt)
 	if (wpt->notes) {
 		return mkshort(h, wpt->notes);
 	}
+
+	/* Should probably never actually happen... */
+	return NULL;
 }
 
 
diff --git a/gpsbabel/vecs.c b/gpsbabel/vecs.c
index 388cd2d1f..c391b813b 100644
--- a/gpsbabel/vecs.c
+++ b/gpsbabel/vecs.c
@@ -739,9 +739,9 @@ disp_formats(int version)
 				vec->extension? vec->extension : "", 
 				vec->desc);
 		}
+		xfree (svp);	
 		break;
 	default:
 		;
 	}
-	xfree (svp);	
 }
-- 
2.30.2